From 5cb3fc4c4f2e829a81fd68b175a0d073f21355a0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Oct 2016 15:35:44 -0400 Subject: [PATCH] Drop deprecated gdk_display_get_screen --- docs/reference/gdk/gdk4-sections.txt | 1 - gdk/gdkdisplay.c | 22 ---------------------- gdk/gdkdisplay.h | 3 --- 3 files changed, 26 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 8a72583420..c1d3e7df30 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -100,7 +100,6 @@ GdkDisplay gdk_display_open gdk_display_get_default gdk_display_get_name -gdk_display_get_screen gdk_display_get_default_screen gdk_display_get_device_manager gdk_display_pointer_ungrab diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 539304bb5a..625804b6dd 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -1519,28 +1519,6 @@ gdk_display_get_name (GdkDisplay *display) return GDK_DISPLAY_GET_CLASS (display)->get_name (display); } -/** - * gdk_display_get_screen: - * @display: a #GdkDisplay - * @screen_num: the screen number - * - * Returns a screen object for one of the screens of the display. - * - * Returns: (transfer none): the #GdkScreen object - * - * Since: 2.2 - * Deprecated: 3.20: There is only one screen; use gdk_display_get_default_screen() to get it. - */ -GdkScreen * -gdk_display_get_screen (GdkDisplay *display, - gint screen_num) -{ - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - g_return_val_if_fail (screen_num == 0, NULL); - - return gdk_display_get_default_screen (display); -} - /** * gdk_display_get_default_screen: * @display: a #GdkDisplay diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index 75e984590d..4a7ca18681 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -50,9 +50,6 @@ GdkDisplay *gdk_display_open (const gchar *display_name); GDK_AVAILABLE_IN_ALL const gchar * gdk_display_get_name (GdkDisplay *display); -GDK_DEPRECATED_IN_3_20 -GdkScreen * gdk_display_get_screen (GdkDisplay *display, - gint screen_num); GDK_AVAILABLE_IN_ALL GdkScreen * gdk_display_get_default_screen (GdkDisplay *display); -- 2.30.2